+++ /dev/null
-include:
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
-
-variables:
- SALSA_CI_DISABLE_REPROTEST: 1
+vtk9 (9.2.6+dfsg1-1+exp2) experimental; urgency=medium
+
+ * [965a45d] New upstream version 9.2.6+dfsg1
+
+ -- Anton Gladky <gladk@debian.org> Fri, 24 Mar 2023 07:42:03 +0100
+
vtk9 (9.1.0+really9.1.0+dfsg2-5) unstable; urgency=medium
[ Elvis Stansvik ]
libproj-dev,
libsqlite3-dev,
libswscale-dev,
- libtbb-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !alpha !ia64],
+ libtbb-dev [linux-any],
libtheora-dev,
libtiff-dev,
libutfcpp-dev,
x11proto-core-dev,
xauth,
xvfb,
- zlib1g-dev
+ zlib1g-dev,
+ sqlite
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/science-team/vtk9
Vcs-Git: https://salsa.debian.org/science-team/vtk9.git
libproj-dev,
libpython3-dev,
libswscale-dev,
- libtbb-dev [linux-any],
+ libtbb-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !alpha !ia64],
libtheora-dev,
libtiff-dev,
libutfcpp-dev,
- libvtk9.1 (= ${binary:Version}),
+ libvtk9.2 (= ${binary:Version}),
libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any],
libx11-dev,
libxft-dev,
This package provides the VTK header files required to compile
C++ programs that use VTK to do 3D visualisation.
-Package: libvtk9.1
+Package: libvtk9.2
Architecture: any
Multi-Arch: same
Section: libs
Package: python3-vtk9
Architecture: any
Section: python
-Depends: libvtk9.1 (= ${binary:Version}),
+Depends: libvtk9.2 (= ${binary:Version}),
python3-mpi4py,
${misc:Depends},
${python3:Depends},
Package: vtk9
Architecture: any
Section: interpreters
-Depends: libvtk9.1 (= ${binary:Version}),
+Depends: libvtk9.2 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: vtk9-doc,
.
This package provides examples for VTK9
-Package: libvtk9.1-qt
+Package: libvtk9.2-qt
Architecture: any
Multi-Arch: same
Section: libs
Multi-Arch: same
Section: libdevel
Depends: libvtk9-dev (= ${binary:Version}),
- libvtk9.1-qt (= ${binary:Version}),
+ libvtk9.2-qt (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
qtbase5-dev,
-usr/include/vtk-9.1 usr/include
+usr/include/vtk-9.2 usr/include
usr/lib/*/*.so
-usr/lib/*/cmake/vtk-9.1
+usr/lib/*/cmake/vtk-9.2
-usr/share/doc/vtk-9.1/doxygen/* /usr/share/vtk-9.1/doxygen/
+usr/share/doc/vtk-9.2/doxygen/* /usr/share/vtk-9.2/doxygen/
-usr/bin/vtkParseJava-9.1 usr/bin
-usr/bin/vtkWrapJava-9.1 usr/bin
+usr/bin/vtkParseJava-9.2 usr/bin
+usr/bin/vtkWrapJava-9.2 usr/bin
usr/lib/*/java/vtk9.jar usr/share/java
usr/lib/*/java/vtk-L*
usr/lib/*/*Qt*.so
-usr/include/vtk-9.1/*Qt*
-usr/include/vtk-9.1/Q*
+usr/include/vtk-9.2/*Qt*
+usr/include/vtk-9.2/Q*
+++ /dev/null
-usr/lib/*/*Qt*.so.*
+++ /dev/null
-libvtk9.1-qt: package-name-doesnt-match-sonames
+++ /dev/null
-usr/lib/*/*.so.*
-usr/lib/*/vtk
+++ /dev/null
-libvtk9.1: package-name-doesnt-match-sonames
--- /dev/null
+usr/lib/*/*Qt*.so.*
--- /dev/null
+libvtk9.2-qt: package-name-doesnt-match-sonames
--- /dev/null
+usr/lib/*/*.so.*
+usr/lib/*/vtk-9.2
--- /dev/null
+libvtk9.2: package-name-doesnt-match-sonames
Description: _matplotlib
-Index: VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+Index: VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
===================================================================
---- VTK-9.1.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -197,6 +197,10 @@ private:
+--- VTK-9.2.5.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -199,6 +199,10 @@ private:
* to implement IsAvailable.
*/
static Availability CheckMPLAvailability();
Bug-Debian: https://bugs.debian.org/1012703
Last-Update: 2022-06-19
---- vtk9-9.1.0+really9.1.0+dfsg2.orig/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
-+++ vtk9-9.1.0+really9.1.0+dfsg2/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
-@@ -1770,7 +1770,7 @@ void ex__compress_variable(int exoid, in
- */
-
- /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
-- const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
-+ // const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
- /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
- const int SZIP_PIXELS_PER_BLOCK =
- file->compression_level == 0 ? 32 : file->compression_level;
+++ /dev/null
-commit bc4d0fec4f791fb198ff316849aaf3faba24b45a
-Author: Gaspard Thevenon <gaspard.thevenon@kitware.com>
-Date: Thu Feb 10 10:19:39 2022 +0100
-
- Fix shader crash in Multi Volume Rendering without GradientTF
-
- When using OpenGLGPUVolumeRayCastMapper with a MultiVolume,
- not specifying a gradient opacity TF produced an error in
- the composed shader (no argument would be given to functions which expected one),
- and nothing was rendered, although this TF is supposed to be optional.
-
- This commit fixes this by adding tests during the declarations of
- those functions inside the shader, and by changing their signatures as needed.
- Therefore, when no gradient opacity TF is given, no argument is expected
- and none is given.
-
-diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx
-index cdcec460ef..dfc65de04b 100644
---- a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx
-+++ b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx
-@@ -2415,7 +2415,8 @@ void vtkOpenGLGPUVolumeRayCastMapper::ReplaceShaderCompute(
- vtkvolume::ComputeGradientOpacityMulti1DDecl(this->AssembledInputs));
-
- vtkShaderProgram::Substitute(fragmentShader, "//VTK::ComputeColor::Dec",
-- vtkvolume::ComputeColorMultiDeclaration(this->AssembledInputs));
-+ vtkvolume::ComputeColorMultiDeclaration(
-+ this->AssembledInputs, vol->GetProperty()->HasGradientOpacity()));
-
- vtkShaderProgram::Substitute(fragmentShader, "//VTK::ComputeLighting::Dec",
- vtkvolume::ComputeLightingMultiDeclaration(ren, this, vol, numComps, independentComponents,
-@@ -2970,6 +2971,23 @@ bool vtkOpenGLGPUVolumeRayCastMapper::vtkInternal::UpdateInputs(vtkRenderer* ren
- this->ForceTransferInit();
- }
-
-+ if (this->MultiVolume)
-+ {
-+ bool hasGradient = this->Parent->AssembledInputs[0].Volume->GetProperty()->HasGradientOpacity();
-+ for (auto& item : this->Parent->AssembledInputs)
-+ {
-+ if (item.second.Volume->GetProperty()->HasGradientOpacity() != hasGradient)
-+ {
-+ vtkGenericWarningMacro(
-+ "Current implentation of vtkOpenGLGPUVolumeRayCastMapper does not support MultiVolume "
-+ "where some volumes have a gradient opacity function and some others don't. "
-+ "Rendering of the MultiVolume is disabled.");
-+ success = false;
-+ break;
-+ }
-+ }
-+ }
-+
- return success;
- }
-
-@@ -3106,7 +3124,10 @@ void vtkOpenGLGPUVolumeRayCastMapper::GPURender(vtkRenderer* ren, vtkVolume* vol
- this->Impl->MultiVolume = multiVol && this->GetInputCount() > 1 ? multiVol : nullptr;
-
- this->Impl->ClearRemovedInputs(renWin);
-- this->Impl->UpdateInputs(ren, vol);
-+ if (!this->Impl->UpdateInputs(ren, vol))
-+ {
-+ return;
-+ }
- this->Impl->UpdateSamplingDistance(ren);
- this->Impl->UpdateTransfer2DYAxisArray(ren, vol);
- this->Impl->UpdateTransferFunctions(ren);
-diff --git a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
-index 766f36ab63..3406bfb431 100644
---- a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
-+++ b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
-@@ -1054,10 +1054,24 @@ std::string ComputeLightingMultiDeclaration(vtkRenderer* vtkNotUsed(ren), vtkVol
- int lightingComplexity)
- {
- vtkVolumeProperty* volProperty = vol->GetProperty();
-- std::string shaderStr = std::string("\
-+
-+ std::string shaderStr = std::string();
-+
-+ // if no gradient TF is needed, don't add it into the function signature
-+ if (volProperty->HasGradientOpacity())
-+ {
-+ shaderStr += std::string("\
- \nvec4 computeLighting(vec3 texPos, vec4 color, const in sampler2D gradientTF, const in sampler3D volume, const int volIdx, int component)\
- \n {\
- \n vec4 finalColor = vec4(0.0);");
-+ }
-+ else
-+ {
-+ shaderStr += std::string("\
-+ \nvec4 computeLighting(vec3 texPos, vec4 color, const in sampler3D volume, const int volIdx, int component)\
-+ \n {\
-+ \n vec4 finalColor = vec4(0.0);");
-+ }
-
- // Shading for composite blending only
- int const shadeReqd = volProperty->GetShade() &&
-@@ -1243,7 +1257,8 @@ std::string ComputeColorDeclaration(vtkRenderer* vtkNotUsed(ren),
- }
-
- //--------------------------------------------------------------------------
--std::string ComputeColorMultiDeclaration(vtkOpenGLGPUVolumeRayCastMapper::VolumeInputMap& inputs)
-+std::string ComputeColorMultiDeclaration(
-+ vtkOpenGLGPUVolumeRayCastMapper::VolumeInputMap& inputs, bool useGradientTF)
- {
- std::ostringstream ss;
- int i = 0;
-@@ -1274,13 +1289,28 @@ std::string ComputeColorMultiDeclaration(vtkOpenGLGPUVolumeRayCastMapper::Volume
- }
- else
- {
-- ss << "vec4 computeColor(vec3 texPos, vec4 scalar, float opacity, const in sampler2D colorTF, "
-- "const in sampler2D gradientTF, const in sampler3D volume, const int volIdx)\n"
-- "{\n"
-- " return clamp(computeLighting(texPos, vec4(texture2D(colorTF,\n"
-- " vec2(scalar.w, 0.0)).xyz, opacity), gradientTF, volume, "
-- "volIdx, 0), 0.0, 1.0);\n"
-- "}\n";
-+ if (useGradientTF)
-+ {
-+ ss
-+ << "vec4 computeColor(vec3 texPos, vec4 scalar, float opacity, const in sampler2D colorTF, "
-+ "const in sampler2D gradientTF, const in sampler3D volume, const int volIdx)\n"
-+ "{\n"
-+ " return clamp(computeLighting(texPos, vec4(texture2D(colorTF,\n"
-+ " vec2(scalar.w, 0.0)).xyz, opacity), gradientTF, volume, "
-+ "volIdx, 0), 0.0, 1.0);\n"
-+ "}\n";
-+ }
-+ else
-+ {
-+ ss
-+ << "vec4 computeColor(vec3 texPos, vec4 scalar, float opacity, const in sampler2D colorTF, "
-+ "const in sampler3D volume, const int volIdx)\n"
-+ "{\n"
-+ " return clamp(computeLighting(texPos, vec4(texture2D(colorTF,\n"
-+ " vec2(scalar.w, 0.0)).xyz, opacity), volume, "
-+ "volIdx, 0), 0.0, 1.0);\n"
-+ "}\n";
-+ }
- }
-
- return ss.str();
-@@ -1828,14 +1858,18 @@ std::string ShadingMultipleInputs(
-
- if (property->GetTransferFunctionMode() == vtkVolumeProperty::TF_1D)
- {
-+ std::string gradientopacity_param = (property->HasGradientOpacity())
-+ ? input.GradientOpacityTablesMap[0] + std::string(", ")
-+ : std::string();
-+
- toShaderStr << " g_srcColor.a = computeOpacity(scalar,"
- << input.OpacityTablesMap[0]
- << ");\n"
- " if (g_srcColor.a > 0.0)\n"
- " {\n"
- " g_srcColor = computeColor(texPos, scalar, g_srcColor.a, "
-- << input.RGBTablesMap[0] << ", " << input.GradientOpacityTablesMap[0] << ", "
-- << "in_volume[" << i << "], " << i << ");\n";
-+ << input.RGBTablesMap[0] << ", " << gradientopacity_param << "in_volume[" << i
-+ << "], " << i << ");\n";
-
- if (property->HasGradientOpacity())
- {
Description: Do not try linking with -lsocket
-Index: VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake
+Index: VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake
===================================================================
---- VTK-9.0.1.orig/Common/System/vtkTestSocketFeatures.cmake
-+++ VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake
+--- VTK-9.2.5.orig/Common/System/vtkTestSocketFeatures.cmake
++++ VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake
@@ -6,9 +6,6 @@ check_library_exists("socket" getsocknam
if(NOT DEFINED VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
Description: Drop medical examples
Last-Update: 2020-10-21
---- vtk9-9.0.1+dfsg1.orig/Examples/CMakeLists.txt
-+++ vtk9-9.0.1+dfsg1/Examples/CMakeLists.txt
-@@ -55,7 +55,7 @@ else ()
+Index: VTK-9.2.5/Examples/CMakeLists.txt
+===================================================================
+--- VTK-9.2.5.orig/Examples/CMakeLists.txt
++++ VTK-9.2.5/Examples/CMakeLists.txt
+@@ -56,7 +56,7 @@ else ()
add_example(IO/Cxx)
add_example(ImageProcessing/Cxx)
add_example(Infovis/Cxx)
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2020-11-05
-Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
+Index: VTK-9.2.5/Wrapping/Python/CMakeLists.txt
===================================================================
---- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt
-+++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
+--- VTK-9.2.5.orig/Wrapping/Python/CMakeLists.txt
++++ VTK-9.2.5/Wrapping/Python/CMakeLists.txt
@@ -23,21 +23,21 @@ endif ()
# The interpreters are not supported in wheel builds, so skip them.
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2020-11-06
-Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake
+Index: VTK-9.2.5/CMake/vtkModuleWrapPython.cmake
===================================================================
---- vtk9-9.0.1+dfsg1.orig/CMake/vtkModuleWrapPython.cmake
-+++ vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake
-@@ -84,7 +84,7 @@ function (vtk_module_python_default_dest
+--- VTK-9.2.5.orig/CMake/vtkModuleWrapPython.cmake
++++ VTK-9.2.5/CMake/vtkModuleWrapPython.cmake
+@@ -87,7 +87,7 @@ function (vtk_module_python_default_dest
"for Python modules.")
set(_vtk_python_version_suffix)
endif ()
endif ()
set("${var}" "${destination}" PARENT_SCOPE)
-Index: vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt
+Index: VTK-9.2.5/Utilities/Python/CMakeLists.txt
===================================================================
---- vtk9-9.0.1+dfsg1.orig/Utilities/Python/CMakeLists.txt
-+++ vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt
-@@ -77,7 +77,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX)
+--- VTK-9.2.5.orig/Utilities/Python/CMakeLists.txt
++++ VTK-9.2.5/Utilities/Python/CMakeLists.txt
+@@ -85,7 +85,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX)
set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages")
else ()
set(VTK_PYTHON_SITE_PACKAGES_SUFFIX
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2020-11-08
---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_class2example.pl
-+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_class2example.pl
+Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
+===================================================================
+--- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl
++++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
# Time-stamp: <2004-06-09 11:12:38 barre>
#
# Build cross-references between classes and examples
---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_cleanhtml.pl
-+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_cleanhtml.pl
+Index: VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl
+===================================================================
+--- VTK-9.2.5.orig/Utilities/Doxygen/doc_cleanhtml.pl
++++ VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
# Time-stamp: <2002-10-25 20:17:59 barre>
#
# Clean the HTML generated by Doxygen to remove some layout quicks
---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_codematch.pl
-+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_codematch.pl
+Index: VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl
+===================================================================
+--- VTK-9.2.5.orig/Utilities/Doxygen/doc_codematch.pl
++++ VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
# Time-stamp: <2002-01-18 16:17:26 barre>
#
# Summary ?
---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_index.pl
-+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_index.pl
+Index: VTK-9.2.5/Utilities/Doxygen/doc_index.pl
+===================================================================
+--- VTK-9.2.5.orig/Utilities/Doxygen/doc_index.pl
++++ VTK-9.2.5/Utilities/Doxygen/doc_index.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
# Time-stamp: <2001-11-21 17:40:48 barre>
#
# Build full-text index
---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_rmpath.pl
-+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_rmpath.pl
+Index: VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl
+===================================================================
+--- VTK-9.2.5.orig/Utilities/Doxygen/doc_rmpath.pl
++++ VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
# Time-stamp: <2001-10-05 11:49:40 barre>
#
# Remove path to intermediate Doxygen dir from html doc
---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_version.pl
-+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_version.pl
+Index: VTK-9.2.5/Utilities/Doxygen/doc_version.pl
+===================================================================
+--- VTK-9.2.5.orig/Utilities/Doxygen/doc_version.pl
++++ VTK-9.2.5/Utilities/Doxygen/doc_version.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
GUISupport/Qt/QVTKOpenGLWindow.cxx | 5 +++++
1 file changed, 5 insertions(+)
-diff --git a/GUISupport/Qt/QVTKOpenGLWindow.cxx b/GUISupport/Qt/QVTKOpenGLWindow.cxx
-index 3bddc19809..79d5c2b653 100644
---- a/GUISupport/Qt/QVTKOpenGLWindow.cxx
-+++ b/GUISupport/Qt/QVTKOpenGLWindow.cxx
-@@ -35,6 +35,11 @@
+Index: VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx
+===================================================================
+--- VTK-9.2.5.orig/GUISupport/Qt/QVTKOpenGLWindow.cxx
++++ VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx
+@@ -34,6 +34,11 @@
#include "vtkObjectFactory.h"
#include "vtkOpenGLState.h"
QVTKOpenGLWindow::QVTKOpenGLWindow(QOpenGLWindow::UpdateBehavior ub, QWindow* p)
: QVTKOpenGLWindow(vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New(), nullptr, ub, p)
{
---
-2.20.1
-
Fixes building for Qt with OpenGL ES.
Author: Adrian Bunk <bunk@debian.org>
---- vtk9-9.1.0+dfsg2.orig/GUISupport/Qt/vtkQWidgetTexture.cxx
-+++ vtk9-9.1.0+dfsg2/GUISupport/Qt/vtkQWidgetTexture.cxx
+Index: VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx
+===================================================================
+--- VTK-9.2.5.orig/GUISupport/Qt/vtkQWidgetTexture.cxx
++++ VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx
@@ -18,7 +18,7 @@
#include "vtkOpenGLResourceFreeCallback.h"
#include "vtkOpenGLState.h"
include/diy/time.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
-index 692cf36..671e69d 100644
---- a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
-+++ b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
-@@ -3,11 +3,11 @@
+Index: VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
+===================================================================
+--- VTK-9.2.5.orig/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
++++ VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
+@@ -3,10 +3,10 @@
#ifndef _WIN32
#include <sys/time.h>
#endif // ifndef _WIN32
namespace diy
- {
-@@ -16,7 +16,7 @@ typedef unsigned long time_type;
+@@ -16,7 +16,7 @@ typedef unsigned long time_typ
inline time_type get_time()
{
clock_serv_t cclock;
mach_timespec_t ts;
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
---
-GitLab
Utilities/Doxygen/doc_class2example.pl | 1 +
1 file changed, 1 insertion(+)
-diff --git a/Utilities/Doxygen/doc_class2example.pl b/Utilities/Doxygen/doc_class2example.pl
-index 3978563..ce8aeca 100755
---- a/Utilities/Doxygen/doc_class2example.pl
-+++ b/Utilities/Doxygen/doc_class2example.pl
+Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
+===================================================================
+--- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl
++++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
@@ -261,6 +261,7 @@ if (exists $args{"parser"}) {
} else {
@parsers = keys %parsers;
my $os_is_win = ($^O =~ m/(MSWin32|Cygwin)/i);
my $open_file_as_text = $os_is_win ? O_TEXT : 0;
---
-2.29.2
-
-
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2021-09-17
---- vtk9-9.0.3+dfsg1.orig/Parallel/MPI4Py/vtk.module
-+++ vtk9-9.0.3+dfsg1/Parallel/MPI4Py/vtk.module
+Index: VTK-9.2.5/Parallel/MPI4Py/vtk.module
+===================================================================
+--- VTK-9.2.5.orig/Parallel/MPI4Py/vtk.module
++++ VTK-9.2.5/Parallel/MPI4Py/vtk.module
@@ -12,4 +12,3 @@ DEPENDS
PRIVATE_DEPENDS
VTK::ParallelMPI
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2021-11-14
---- vtk9-9.1.0+dfsg1.orig/CMake/vtkCompilerExtraFlags.cmake
-+++ vtk9-9.1.0+dfsg1/CMake/vtkCompilerExtraFlags.cmake
+Index: VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake
+===================================================================
+--- VTK-9.2.5.orig/CMake/vtkCompilerExtraFlags.cmake
++++ VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake
@@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
include(CheckCXXCompilerFlag)
97_reproducible_builds.patch
98_fix_mpi4py.py
99_fix_ftbfs.patch
-110_vtk9_netcdf.patch
-120_fix_shader_crash.patch
+#110_vtk9_netcdf.patch
usr/lib/python3
usr/bin/pvtkpython
usr/bin/vtkpython-9.0
-usr/bin/vtkWrapPython-9.1
-usr/bin/vtkWrapPythonInit-9.1
+usr/bin/vtkWrapPython-9.2
+usr/bin/vtkWrapPythonInit-9.2
export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
endif
-notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64 alpha ia64
+notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64
ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs)))
extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB"
else
# Correct headers for paraview
mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
endif
- sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.1/VTK-targets.cmake
+ sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.2/VTK-targets.cmake
execute_after_dh_install:
rm -rf $(CURDIR)/debian/tmp/usr/share/licenses
find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \; || true
find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; || true
find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \; || true
- find $(CURDIR)/debian/libvtk9.1/ -name "*Qt*" -exec rm {} \; || true
+ find $(CURDIR)/debian/libvtk9.2/ -name "*Qt*" -exec rm {} \; || true
find $(CURDIR)/debian/tmp/usr/share/doc/vtk-9.0/doxygen -name "_formulas.log" -exec rm {} \; || true
find $(CURDIR)/debian/build/Utilities/Doxygen/doc/html -name "_formulas.log" -exec rm {} \; || true
Name: VTK
-Bug-Database: https://gitlab.kitware.com/vtk/vtk/-/issues
-Bug-Submit: https://gitlab.kitware.com/vtk/vtk/-/issues/new
+Bug-Database: https://gitlab.kitware.com/vtk/vtk/issues
+Bug-Submit: https://gitlab.kitware.com/vtk/vtk/issues/new
Documentation: https://vtk.org/documentation/
Repository: https://gitlab.kitware.com/vtk/vtk.git
Repository-Browse: https://gitlab.kitware.com/vtk/vtk
-debian/tmp/usr/share/doc/vtk-9.1/doxygen
+debian/tmp/usr/share/doc/vtk-9.2/doxygen
debian/build/Utilities/Doxygen/doc/html
-usr/bin/vtkWrapHierarchy-9.1
-usr/bin/vtkProbeOpenGLVersion-9.1
+usr/bin/vtkWrapHierarchy-9.2
+usr/bin/vtkProbeOpenGLVersion-9.2
projects / vtk9.git / commitdiff